Merge from gnulib.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 18 Apr 2011 04:04:42 +0000 (21:04 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 18 Apr 2011 04:04:42 +0000 (21:04 -0700)

Trivial merge